<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
<head>
<title>Source code</title>
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
</head>
<body>
<div class="sourceContainer">
<pre><span class="sourceLineNo">001</span><a name="line.1"></a>
<span class="sourceLineNo">002</span>/*<a name="line.2"></a>
<span class="sourceLineNo">003</span> * Copyright (C) 2012 Archie L. Cobbs. All rights reserved.<a name="line.3"></a>
<span class="sourceLineNo">004</span> *<a name="line.4"></a>
<span class="sourceLineNo">005</span> * $Id: GitRepository.html 947 2014-11-12 22:14:09Z archie.cobbs $<a name="line.5"></a>
<span class="sourceLineNo">006</span> */<a name="line.6"></a>
<span class="sourceLineNo">007</span><a name="line.7"></a>
<span class="sourceLineNo">008</span>package org.dellroad.stuff.pobj.distrib;<a name="line.8"></a>
<span class="sourceLineNo">009</span><a name="line.9"></a>
<span class="sourceLineNo">010</span>import java.io.File;<a name="line.10"></a>
<span class="sourceLineNo">011</span>import java.io.FileInputStream;<a name="line.11"></a>
<span class="sourceLineNo">012</span>import java.io.IOException;<a name="line.12"></a>
<span class="sourceLineNo">013</span>import java.io.InputStreamReader;<a name="line.13"></a>
<span class="sourceLineNo">014</span>import java.io.LineNumberReader;<a name="line.14"></a>
<span class="sourceLineNo">015</span>import java.nio.charset.Charset;<a name="line.15"></a>
<span class="sourceLineNo">016</span>import java.util.ArrayList;<a name="line.16"></a>
<span class="sourceLineNo">017</span>import java.util.Date;<a name="line.17"></a>
<span class="sourceLineNo">018</span>import java.util.List;<a name="line.18"></a>
<span class="sourceLineNo">019</span>import java.util.regex.Matcher;<a name="line.19"></a>
<span class="sourceLineNo">020</span>import java.util.regex.Pattern;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
<span class="sourceLineNo">022</span>import org.dellroad.stuff.spring.AbstractBean;<a name="line.22"></a>
<span class="sourceLineNo">023</span><a name="line.23"></a>
<span class="sourceLineNo">024</span>/**<a name="line.24"></a>
<span class="sourceLineNo">025</span> * Represents a {@code git(1)} repository and provides a few simple methods that wrap the command-line client<a name="line.25"></a>
<span class="sourceLineNo">026</span> * and provide the functionality needed by {@link Synchronizer}.<a name="line.26"></a>
<span class="sourceLineNo">027</span> * Only normal (i.e., non-bare) repositories are supported.<a name="line.27"></a>
<span class="sourceLineNo">028</span> *<a name="line.28"></a>
<span class="sourceLineNo">029</span> * &lt;p&gt;<a name="line.29"></a>
<span class="sourceLineNo">030</span> * This class assumes the repository already has all branches and remotes already configured, and that no<a name="line.30"></a>
<span class="sourceLineNo">031</span> * other external process is accessing the {@code git(1)} repository without our knowledge.<a name="line.31"></a>
<span class="sourceLineNo">032</span> * &lt;/p&gt;<a name="line.32"></a>
<span class="sourceLineNo">033</span> *<a name="line.33"></a>
<span class="sourceLineNo">034</span> * &lt;p&gt;<a name="line.34"></a>
<span class="sourceLineNo">035</span> * Instances are thread safe and guarantees exclusive access to the working directory<a name="line.35"></a>
<span class="sourceLineNo">036</span> * to each {@link Accessor} while it is in use.<a name="line.36"></a>
<span class="sourceLineNo">037</span> * &lt;/p&gt;<a name="line.37"></a>
<span class="sourceLineNo">038</span> *<a name="line.38"></a>
<span class="sourceLineNo">039</span> * &lt;p&gt;<a name="line.39"></a>
<span class="sourceLineNo">040</span> * Requires git version at least 1.7.4.<a name="line.40"></a>
<span class="sourceLineNo">041</span> * &lt;/p&gt;<a name="line.41"></a>
<span class="sourceLineNo">042</span> *<a name="line.42"></a>
<span class="sourceLineNo">043</span> * @see &lt;a href="http://git-scm.com/"&gt;Git web site&lt;/a&gt;<a name="line.43"></a>
<span class="sourceLineNo">044</span> */<a name="line.44"></a>
<span class="sourceLineNo">045</span>public class GitRepository extends AbstractBean {<a name="line.45"></a>
<span class="sourceLineNo">046</span><a name="line.46"></a>
<span class="sourceLineNo">047</span>    /**<a name="line.47"></a>
<span class="sourceLineNo">048</span>     * Accepted git branch name pattern.<a name="line.48"></a>
<span class="sourceLineNo">049</span>     */<a name="line.49"></a>
<span class="sourceLineNo">050</span>    public static final Pattern BRANCH_NAME_PATTERN = Pattern.compile("[\\w][-:\\w]*");<a name="line.50"></a>
<span class="sourceLineNo">051</span><a name="line.51"></a>
<span class="sourceLineNo">052</span>    /**<a name="line.52"></a>
<span class="sourceLineNo">053</span>     * Accepted git remote name pattern.<a name="line.53"></a>
<span class="sourceLineNo">054</span>     */<a name="line.54"></a>
<span class="sourceLineNo">055</span>    public static final Pattern REMOTE_NAME_PATTERN = Pattern.compile("[\\w][-:\\w]*");<a name="line.55"></a>
<span class="sourceLineNo">056</span><a name="line.56"></a>
<span class="sourceLineNo">057</span>    /**<a name="line.57"></a>
<span class="sourceLineNo">058</span>     * SHA1 pattern.<a name="line.58"></a>
<span class="sourceLineNo">059</span>     */<a name="line.59"></a>
<span class="sourceLineNo">060</span>    public static final Pattern SHA1_PATTERN = Pattern.compile("[0-9a-f]{40}");<a name="line.60"></a>
<span class="sourceLineNo">061</span><a name="line.61"></a>
<span class="sourceLineNo">062</span>    private final File dir;<a name="line.62"></a>
<span class="sourceLineNo">063</span><a name="line.63"></a>
<span class="sourceLineNo">064</span>// Constructors<a name="line.64"></a>
<span class="sourceLineNo">065</span><a name="line.65"></a>
<span class="sourceLineNo">066</span>    /**<a name="line.66"></a>
<span class="sourceLineNo">067</span>     * Constructor.<a name="line.67"></a>
<span class="sourceLineNo">068</span>     *<a name="line.68"></a>
<span class="sourceLineNo">069</span>     * @param dir repository filesystem location (i.e., the directory containing {@code .git} as a subdirectory)<a name="line.69"></a>
<span class="sourceLineNo">070</span>     * @throws IllegalArgumentException if {@code dir} is null<a name="line.70"></a>
<span class="sourceLineNo">071</span>     */<a name="line.71"></a>
<span class="sourceLineNo">072</span>    public GitRepository(File dir) {<a name="line.72"></a>
<span class="sourceLineNo">073</span>        if (dir == null)<a name="line.73"></a>
<span class="sourceLineNo">074</span>            throw new IllegalArgumentException("null dir");<a name="line.74"></a>
<span class="sourceLineNo">075</span>        this.dir = dir;<a name="line.75"></a>
<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
<span class="sourceLineNo">077</span><a name="line.77"></a>
<span class="sourceLineNo">078</span>// Lifecycle<a name="line.78"></a>
<span class="sourceLineNo">079</span><a name="line.79"></a>
<span class="sourceLineNo">080</span>    @Override<a name="line.80"></a>
<span class="sourceLineNo">081</span>    public void afterPropertiesSet() throws Exception {<a name="line.81"></a>
<span class="sourceLineNo">082</span>        super.afterPropertiesSet();<a name="line.82"></a>
<span class="sourceLineNo">083</span>        final File gitDir = new File(this.dir, ".git");<a name="line.83"></a>
<span class="sourceLineNo">084</span>        if (!gitDir.exists() || !gitDir.isDirectory())<a name="line.84"></a>
<span class="sourceLineNo">085</span>            throw new Exception("`" + this.dir + "' is not a git repository");<a name="line.85"></a>
<span class="sourceLineNo">086</span>    }<a name="line.86"></a>
<span class="sourceLineNo">087</span><a name="line.87"></a>
<span class="sourceLineNo">088</span>// Methods<a name="line.88"></a>
<span class="sourceLineNo">089</span><a name="line.89"></a>
<span class="sourceLineNo">090</span>    /**<a name="line.90"></a>
<span class="sourceLineNo">091</span>     * Get the git working directory associated with this instance.<a name="line.91"></a>
<span class="sourceLineNo">092</span>     */<a name="line.92"></a>
<span class="sourceLineNo">093</span>    public File getDirectory() {<a name="line.93"></a>
<span class="sourceLineNo">094</span>        return this.dir;<a name="line.94"></a>
<span class="sourceLineNo">095</span>    }<a name="line.95"></a>
<span class="sourceLineNo">096</span><a name="line.96"></a>
<span class="sourceLineNo">097</span>    /**<a name="line.97"></a>
<span class="sourceLineNo">098</span>     * Fetch data from all configured remotes to update our local copy of their information.<a name="line.98"></a>
<span class="sourceLineNo">099</span>     *<a name="line.99"></a>
<span class="sourceLineNo">100</span>     * @throws GitException if an error occurs<a name="line.100"></a>
<span class="sourceLineNo">101</span>     */<a name="line.101"></a>
<span class="sourceLineNo">102</span>    public synchronized void fetch() {<a name="line.102"></a>
<span class="sourceLineNo">103</span>        new GitCommand(this.dir, "fetch", "--all").run();<a name="line.103"></a>
<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
<span class="sourceLineNo">106</span>    /**<a name="line.106"></a>
<span class="sourceLineNo">107</span>     * Fetch data from the named remotes to update our local copy of their information.<a name="line.107"></a>
<span class="sourceLineNo">108</span>     *<a name="line.108"></a>
<span class="sourceLineNo">109</span>     * @param remotes list of remotes<a name="line.109"></a>
<span class="sourceLineNo">110</span>     * @throws GitException if an error occurs<a name="line.110"></a>
<span class="sourceLineNo">111</span>     * @throws IllegalArgumentException if {@code remotes} or any element is null<a name="line.111"></a>
<span class="sourceLineNo">112</span>     * @throws IllegalArgumentException if an remote does not match {@link #REMOTE_NAME_PATTERN}<a name="line.112"></a>
<span class="sourceLineNo">113</span>     */<a name="line.113"></a>
<span class="sourceLineNo">114</span>    public synchronized void fetch(List&lt;String&gt; remotes) {<a name="line.114"></a>
<span class="sourceLineNo">115</span><a name="line.115"></a>
<span class="sourceLineNo">116</span>        // Sanity check<a name="line.116"></a>
<span class="sourceLineNo">117</span>        if (remotes == null)<a name="line.117"></a>
<span class="sourceLineNo">118</span>            throw new IllegalArgumentException("null remotes");<a name="line.118"></a>
<span class="sourceLineNo">119</span>        for (String remote : remotes) {<a name="line.119"></a>
<span class="sourceLineNo">120</span>            if (remote == null)<a name="line.120"></a>
<span class="sourceLineNo">121</span>                throw new IllegalArgumentException("null remote");<a name="line.121"></a>
<span class="sourceLineNo">122</span>            if (!REMOTE_NAME_PATTERN.matcher(remote).matches())<a name="line.122"></a>
<span class="sourceLineNo">123</span>                throw new IllegalArgumentException("illegal remote name `" + remote + "'");<a name="line.123"></a>
<span class="sourceLineNo">124</span>        }<a name="line.124"></a>
<span class="sourceLineNo">125</span><a name="line.125"></a>
<span class="sourceLineNo">126</span>        // Fetch<a name="line.126"></a>
<span class="sourceLineNo">127</span>        final ArrayList&lt;String&gt; params = new ArrayList&lt;String&gt;(remotes.size() + 2);<a name="line.127"></a>
<span class="sourceLineNo">128</span>        params.add("fetch");<a name="line.128"></a>
<span class="sourceLineNo">129</span>        params.add("--multiple");<a name="line.129"></a>
<span class="sourceLineNo">130</span>        params.addAll(remotes);<a name="line.130"></a>
<span class="sourceLineNo">131</span>        new GitCommand(this.dir, params).run();<a name="line.131"></a>
<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
<span class="sourceLineNo">133</span><a name="line.133"></a>
<span class="sourceLineNo">134</span>    /**<a name="line.134"></a>
<span class="sourceLineNo">135</span>     * Get the author date associated with the given commit.<a name="line.135"></a>
<span class="sourceLineNo">136</span>     *<a name="line.136"></a>
<span class="sourceLineNo">137</span>     * @param tree commit reference<a name="line.137"></a>
<span class="sourceLineNo">138</span>     * @return author date<a name="line.138"></a>
<span class="sourceLineNo">139</span>     * @throws GitException if git fails<a name="line.139"></a>
<span class="sourceLineNo">140</span>     * @throws IllegalArgumentException if {@code tree} is null<a name="line.140"></a>
<span class="sourceLineNo">141</span>     */<a name="line.141"></a>
<span class="sourceLineNo">142</span>    public synchronized Date getAuthorDate(String tree) {<a name="line.142"></a>
<span class="sourceLineNo">143</span>        try {<a name="line.143"></a>
<span class="sourceLineNo">144</span>            return new Date(Long.parseLong(new GitCommand(this.dir,<a name="line.144"></a>
<span class="sourceLineNo">145</span>              "log", "-1", "--format=format:%at", tree).runAndGetOutput(), 10) * 1000L);<a name="line.145"></a>
<span class="sourceLineNo">146</span>        } catch (NumberFormatException e) {<a name="line.146"></a>
<span class="sourceLineNo">147</span>            throw new GitException("error parsing git output", e);<a name="line.147"></a>
<span class="sourceLineNo">148</span>        }<a name="line.148"></a>
<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
<span class="sourceLineNo">150</span><a name="line.150"></a>
<span class="sourceLineNo">151</span>    /**<a name="line.151"></a>
<span class="sourceLineNo">152</span>     * Access the head of the specified branch or the named commit.<a name="line.152"></a>
<span class="sourceLineNo">153</span>     * Any changes made by the {@link Accessor} are discarded when this method completes.<a name="line.153"></a>
<span class="sourceLineNo">154</span>     *<a name="line.154"></a>
<span class="sourceLineNo">155</span>     * @param branch name of the branch or commit we want to access<a name="line.155"></a>
<span class="sourceLineNo">156</span>     * @param accessor callback interface to access the working directory contents<a name="line.156"></a>
<span class="sourceLineNo">157</span>     * @return commit name (SHA-1 hash) corresponding to what tree was accessed<a name="line.157"></a>
<span class="sourceLineNo">158</span>     * @throws GitException if {@code branch} is not a local branch or a commit ID<a name="line.158"></a>
<span class="sourceLineNo">159</span>     * @throws IllegalArgumentException if {@code branch} is null<a name="line.159"></a>
<span class="sourceLineNo">160</span>     * @throws IllegalArgumentException if {@code branch} does not match {@link #BRANCH_NAME_PATTERN}<a name="line.160"></a>
<span class="sourceLineNo">161</span>     * @throws IllegalArgumentException if {@code branch} is null<a name="line.161"></a>
<span class="sourceLineNo">162</span>     * @throws IllegalArgumentException if {@code accessor} is null<a name="line.162"></a>
<span class="sourceLineNo">163</span>     */<a name="line.163"></a>
<span class="sourceLineNo">164</span>    public synchronized String access(String branch, Accessor accessor) {<a name="line.164"></a>
<span class="sourceLineNo">165</span><a name="line.165"></a>
<span class="sourceLineNo">166</span>        // Sanity check<a name="line.166"></a>
<span class="sourceLineNo">167</span>        if (branch == null)<a name="line.167"></a>
<span class="sourceLineNo">168</span>            throw new IllegalArgumentException("null branch");<a name="line.168"></a>
<span class="sourceLineNo">169</span>        if (!BRANCH_NAME_PATTERN.matcher(branch).matches())<a name="line.169"></a>
<span class="sourceLineNo">170</span>            throw new IllegalArgumentException("illegal branch name `" + branch + "'");<a name="line.170"></a>
<span class="sourceLineNo">171</span>        if (accessor == null)<a name="line.171"></a>
<span class="sourceLineNo">172</span>            throw new IllegalArgumentException("null accessor");<a name="line.172"></a>
<span class="sourceLineNo">173</span><a name="line.173"></a>
<span class="sourceLineNo">174</span>        // Reset<a name="line.174"></a>
<span class="sourceLineNo">175</span>        this.reset();<a name="line.175"></a>
<span class="sourceLineNo">176</span><a name="line.176"></a>
<span class="sourceLineNo">177</span>        // Checkout the commit<a name="line.177"></a>
<span class="sourceLineNo">178</span>        new GitCommand(this.dir, "checkout", "--force", branch).run();<a name="line.178"></a>
<span class="sourceLineNo">179</span><a name="line.179"></a>
<span class="sourceLineNo">180</span>        // Get the commit ID that we have checked out<a name="line.180"></a>
<span class="sourceLineNo">181</span>        final String commit = this.getCurrentCommit();<a name="line.181"></a>
<span class="sourceLineNo">182</span><a name="line.182"></a>
<span class="sourceLineNo">183</span>        // Grant access<a name="line.183"></a>
<span class="sourceLineNo">184</span>        try {<a name="line.184"></a>
<span class="sourceLineNo">185</span>            accessor.accessWorkingCopy(this.dir);<a name="line.185"></a>
<span class="sourceLineNo">186</span>        } finally {<a name="line.186"></a>
<span class="sourceLineNo">187</span>            this.reset();<a name="line.187"></a>
<span class="sourceLineNo">188</span>        }<a name="line.188"></a>
<span class="sourceLineNo">189</span><a name="line.189"></a>
<span class="sourceLineNo">190</span>        // Done<a name="line.190"></a>
<span class="sourceLineNo">191</span>        return commit;<a name="line.191"></a>
<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
<span class="sourceLineNo">193</span><a name="line.193"></a>
<span class="sourceLineNo">194</span>    /**<a name="line.194"></a>
<span class="sourceLineNo">195</span>     * Commit changes onto the specified branch. The branch must already exist.<a name="line.195"></a>
<span class="sourceLineNo">196</span>     *<a name="line.196"></a>
<span class="sourceLineNo">197</span>     * &lt;p&gt;<a name="line.197"></a>
<span class="sourceLineNo">198</span>     * If after the {@code accessor} runs nothing has changed, then no commit is performed<a name="line.198"></a>
<span class="sourceLineNo">199</span>     * and the previous commit ID is returned.<a name="line.199"></a>
<span class="sourceLineNo">200</span>     * &lt;/p&gt;<a name="line.200"></a>
<span class="sourceLineNo">201</span>     *<a name="line.201"></a>
<span class="sourceLineNo">202</span>     * @param branch name of the branch we want to commit onto<a name="line.202"></a>
<span class="sourceLineNo">203</span>     * @param accessor callback interface to update the working directory contents<a name="line.203"></a>
<span class="sourceLineNo">204</span>     * @param message commit message<a name="line.204"></a>
<span class="sourceLineNo">205</span>     * @return commit name (SHA-1 hash), or previous existing commit if no changes were made<a name="line.205"></a>
<span class="sourceLineNo">206</span>     * @throws GitException if {@code branch} is not an existing local branch<a name="line.206"></a>
<span class="sourceLineNo">207</span>     * @throws IllegalArgumentException if {@code branch} is null<a name="line.207"></a>
<span class="sourceLineNo">208</span>     * @throws IllegalArgumentException if {@code branch} does not match {@link #BRANCH_NAME_PATTERN}<a name="line.208"></a>
<span class="sourceLineNo">209</span>     * @throws IllegalArgumentException if {@code accessor} is null<a name="line.209"></a>
<span class="sourceLineNo">210</span>     * @throws IllegalArgumentException if {@code message} is null<a name="line.210"></a>
<span class="sourceLineNo">211</span>     */<a name="line.211"></a>
<span class="sourceLineNo">212</span>    public synchronized String commit(String branch, Accessor accessor, String message) {<a name="line.212"></a>
<span class="sourceLineNo">213</span><a name="line.213"></a>
<span class="sourceLineNo">214</span>        // Sanity check<a name="line.214"></a>
<span class="sourceLineNo">215</span>        if (branch == null)<a name="line.215"></a>
<span class="sourceLineNo">216</span>            throw new IllegalArgumentException("null branch");<a name="line.216"></a>
<span class="sourceLineNo">217</span>        if (!BRANCH_NAME_PATTERN.matcher(branch).matches())<a name="line.217"></a>
<span class="sourceLineNo">218</span>            throw new IllegalArgumentException("illegal branch name `" + branch + "'");<a name="line.218"></a>
<span class="sourceLineNo">219</span>        if (accessor == null)<a name="line.219"></a>
<span class="sourceLineNo">220</span>            throw new IllegalArgumentException("null accessor");<a name="line.220"></a>
<span class="sourceLineNo">221</span>        if (message == null)<a name="line.221"></a>
<span class="sourceLineNo">222</span>            throw new IllegalArgumentException("null message");<a name="line.222"></a>
<span class="sourceLineNo">223</span><a name="line.223"></a>
<span class="sourceLineNo">224</span>        // Get ref file and verify branch is really a local branch<a name="line.224"></a>
<span class="sourceLineNo">225</span>        final File refFile = this.getRepoFile("refs/heads/" + branch);<a name="line.225"></a>
<span class="sourceLineNo">226</span>        if (!refFile.exists())<a name="line.226"></a>
<span class="sourceLineNo">227</span>            throw new GitException("branch `" + branch + "' does not exist or is not a local branch");<a name="line.227"></a>
<span class="sourceLineNo">228</span><a name="line.228"></a>
<span class="sourceLineNo">229</span>        // Reset<a name="line.229"></a>
<span class="sourceLineNo">230</span>        this.reset();<a name="line.230"></a>
<span class="sourceLineNo">231</span><a name="line.231"></a>
<span class="sourceLineNo">232</span>        // Perform commit steps<a name="line.232"></a>
<span class="sourceLineNo">233</span>        try {<a name="line.233"></a>
<span class="sourceLineNo">234</span><a name="line.234"></a>
<span class="sourceLineNo">235</span>            // Check out branch<a name="line.235"></a>
<span class="sourceLineNo">236</span>            new GitCommand(this.dir, "checkout", "--force", branch).run();<a name="line.236"></a>
<span class="sourceLineNo">237</span><a name="line.237"></a>
<span class="sourceLineNo">238</span>            // Apply changes<a name="line.238"></a>
<span class="sourceLineNo">239</span>            accessor.accessWorkingCopy(this.dir);<a name="line.239"></a>
<span class="sourceLineNo">240</span><a name="line.240"></a>
<span class="sourceLineNo">241</span>            // Attempt commit only if something has changed<a name="line.241"></a>
<span class="sourceLineNo">242</span>            if (new GitCommand(this.dir, "status", "--porcelain").runAndGetOutput().length() &gt; 0) {<a name="line.242"></a>
<span class="sourceLineNo">243</span><a name="line.243"></a>
<span class="sourceLineNo">244</span>                // Stage them into the index<a name="line.244"></a>
<span class="sourceLineNo">245</span>                new GitCommand(this.dir, "add", "--all").run();<a name="line.245"></a>
<span class="sourceLineNo">246</span><a name="line.246"></a>
<span class="sourceLineNo">247</span>                // Commit them<a name="line.247"></a>
<span class="sourceLineNo">248</span>                new GitCommand(this.dir, "commit", "--message", message).run();<a name="line.248"></a>
<span class="sourceLineNo">249</span>            }<a name="line.249"></a>
<span class="sourceLineNo">250</span>        } finally {<a name="line.250"></a>
<span class="sourceLineNo">251</span>            this.reset();<a name="line.251"></a>
<span class="sourceLineNo">252</span>        }<a name="line.252"></a>
<span class="sourceLineNo">253</span><a name="line.253"></a>
<span class="sourceLineNo">254</span>        // Done<a name="line.254"></a>
<span class="sourceLineNo">255</span>        return this.getCurrentCommit();<a name="line.255"></a>
<span class="sourceLineNo">256</span>    }<a name="line.256"></a>
<span class="sourceLineNo">257</span><a name="line.257"></a>
<span class="sourceLineNo">258</span>    /**<a name="line.258"></a>
<span class="sourceLineNo">259</span>     * Ensure the specified local branch exists. If it does not, it will be created with an initial empty commit.<a name="line.259"></a>
<span class="sourceLineNo">260</span>     *<a name="line.260"></a>
<span class="sourceLineNo">261</span>     * @param branch name of the branch we want to ensure exists<a name="line.261"></a>
<span class="sourceLineNo">262</span>     * @param message commit message (only used if branch does not yet exist)<a name="line.262"></a>
<span class="sourceLineNo">263</span>     * @throws IllegalArgumentException if {@code branch} is null<a name="line.263"></a>
<span class="sourceLineNo">264</span>     * @throws IllegalArgumentException if {@code branch} does not match {@link #BRANCH_NAME_PATTERN}<a name="line.264"></a>
<span class="sourceLineNo">265</span>     * @throws IllegalArgumentException if {@code message} is null<a name="line.265"></a>
<span class="sourceLineNo">266</span>     */<a name="line.266"></a>
<span class="sourceLineNo">267</span>    public synchronized void ensureBranch(String branch, String message) {<a name="line.267"></a>
<span class="sourceLineNo">268</span><a name="line.268"></a>
<span class="sourceLineNo">269</span>        // Sanity check<a name="line.269"></a>
<span class="sourceLineNo">270</span>        if (branch == null)<a name="line.270"></a>
<span class="sourceLineNo">271</span>            throw new IllegalArgumentException("null branch");<a name="line.271"></a>
<span class="sourceLineNo">272</span>        if (!BRANCH_NAME_PATTERN.matcher(branch).matches())<a name="line.272"></a>
<span class="sourceLineNo">273</span>            throw new IllegalArgumentException("illegal branch name `" + branch + "'");<a name="line.273"></a>
<span class="sourceLineNo">274</span>        if (message == null)<a name="line.274"></a>
<span class="sourceLineNo">275</span>            throw new IllegalArgumentException("null message");<a name="line.275"></a>
<span class="sourceLineNo">276</span><a name="line.276"></a>
<span class="sourceLineNo">277</span>        // Does branch already exist?<a name="line.277"></a>
<span class="sourceLineNo">278</span>        final File refFile = this.getRepoFile("refs/heads/" + branch);<a name="line.278"></a>
<span class="sourceLineNo">279</span>        if (refFile.exists())<a name="line.279"></a>
<span class="sourceLineNo">280</span>            return;<a name="line.280"></a>
<span class="sourceLineNo">281</span><a name="line.281"></a>
<span class="sourceLineNo">282</span>        // Create a commit with no parents and an empty tree<a name="line.282"></a>
<span class="sourceLineNo">283</span>        this.log.info("creating new local branch `" + branch + "' starting with an empty commit in directory `" + this.dir + "'");<a name="line.283"></a>
<span class="sourceLineNo">284</span>        new GitCommand(this.dir, "read-tree", "--empty").run();<a name="line.284"></a>
<span class="sourceLineNo">285</span>        final String tree = new GitCommand(this.dir, "write-tree").runAndGetOutput();<a name="line.285"></a>
<span class="sourceLineNo">286</span>        if (!SHA1_PATTERN.matcher(tree).matches())<a name="line.286"></a>
<span class="sourceLineNo">287</span>            throw new GitException("can't interpret output from `git write-tree': " + tree);<a name="line.287"></a>
<span class="sourceLineNo">288</span>        final String commit = new GitCommand(this.dir, "commit-tree", "-m", message, tree).runAndGetOutput();<a name="line.288"></a>
<span class="sourceLineNo">289</span><a name="line.289"></a>
<span class="sourceLineNo">290</span>        // Create a branch starting there<a name="line.290"></a>
<span class="sourceLineNo">291</span>        new GitCommand(this.dir, "branch", branch, commit).run();<a name="line.291"></a>
<span class="sourceLineNo">292</span>    }<a name="line.292"></a>
<span class="sourceLineNo">293</span><a name="line.293"></a>
<span class="sourceLineNo">294</span>    /**<a name="line.294"></a>
<span class="sourceLineNo">295</span>     * Compare two committed trees for equality.<a name="line.295"></a>
<span class="sourceLineNo">296</span>     *<a name="line.296"></a>
<span class="sourceLineNo">297</span>     * @param tree1 name of the first tree (branch name, commit, etc.)<a name="line.297"></a>
<span class="sourceLineNo">298</span>     * @param tree2 name of the second tree (branch name, commit, etc.)<a name="line.298"></a>
<span class="sourceLineNo">299</span>     * @return true if the trees are equal, otherwise false<a name="line.299"></a>
<span class="sourceLineNo">300</span>     * @throws GitException if {@code tree1} or {@code tree2} is not a valid branch or commit reference<a name="line.300"></a>
<span class="sourceLineNo">301</span>     * @throws IllegalArgumentException if {@code tree1} or {@code tree2} is null<a name="line.301"></a>
<span class="sourceLineNo">302</span>     */<a name="line.302"></a>
<span class="sourceLineNo">303</span>    public synchronized boolean equalTrees(String tree1, String tree2) {<a name="line.303"></a>
<span class="sourceLineNo">304</span>        final GitCommand diff = new GitCommand(this.dir, "diff", "--quiet", tree1, tree2);<a name="line.304"></a>
<span class="sourceLineNo">305</span>        final int exitValue = diff.run(true);<a name="line.305"></a>
<span class="sourceLineNo">306</span>        switch (exitValue) {<a name="line.306"></a>
<span class="sourceLineNo">307</span>        case 0:<a name="line.307"></a>
<span class="sourceLineNo">308</span>            return true;<a name="line.308"></a>
<span class="sourceLineNo">309</span>        case 1:<a name="line.309"></a>
<span class="sourceLineNo">310</span>            return false;<a name="line.310"></a>
<span class="sourceLineNo">311</span>        default:<a name="line.311"></a>
<span class="sourceLineNo">312</span>            throw new GitException("command `" + diff + "' in directory `" + this.dir + "' failed with exit value " + exitValue);<a name="line.312"></a>
<span class="sourceLineNo">313</span>        }<a name="line.313"></a>
<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
<span class="sourceLineNo">315</span><a name="line.315"></a>
<span class="sourceLineNo">316</span>    /**<a name="line.316"></a>
<span class="sourceLineNo">317</span>     * Merge and commit.<a name="line.317"></a>
<span class="sourceLineNo">318</span>     *<a name="line.318"></a>
<span class="sourceLineNo">319</span>     * &lt;p&gt;<a name="line.319"></a>
<span class="sourceLineNo">320</span>     * Trivial merges, i.e., when {@code other} is already an ancestor of {@code branch}, do not result in a new commit<a name="line.320"></a>
<span class="sourceLineNo">321</span>     * and the {@code accessor} is not run.<a name="line.321"></a>
<span class="sourceLineNo">322</span>     * &lt;/p&gt;<a name="line.322"></a>
<span class="sourceLineNo">323</span>     *<a name="line.323"></a>
<span class="sourceLineNo">324</span>     * @param branch name of the branch we want to commit onto<a name="line.324"></a>
<span class="sourceLineNo">325</span>     * @param other name of the other commit or branch we want to merge into {@code branch}<a name="line.325"></a>
<span class="sourceLineNo">326</span>     * @param strategy merge strategy<a name="line.326"></a>
<span class="sourceLineNo">327</span>     * @param accessor callback interface to access the working directory contents after the merge; may be null<a name="line.327"></a>
<span class="sourceLineNo">328</span>     * @param message commit message<a name="line.328"></a>
<span class="sourceLineNo">329</span>     * @return commit name (SHA-1 hash)<a name="line.329"></a>
<span class="sourceLineNo">330</span>     * @throws GitException if {@code branch} is not a local branch<a name="line.330"></a>
<span class="sourceLineNo">331</span>     * @throws GitException if {@code other} is not a valid branch or commit reference<a name="line.331"></a>
<span class="sourceLineNo">332</span>     * @throws GitMergeConflictException if the merge fails with conflicts<a name="line.332"></a>
<span class="sourceLineNo">333</span>     * @throws IllegalArgumentException if {@code branch} or {@code other} is null<a name="line.333"></a>
<span class="sourceLineNo">334</span>     * @throws IllegalArgumentException if {@code branch} does not match {@link #BRANCH_NAME_PATTERN}<a name="line.334"></a>
<span class="sourceLineNo">335</span>     * @throws IllegalArgumentException if {@code message} is null<a name="line.335"></a>
<span class="sourceLineNo">336</span>     */<a name="line.336"></a>
<span class="sourceLineNo">337</span>    public synchronized String merge(String branch, String other, MergeStrategy strategy, Accessor accessor, String message) {<a name="line.337"></a>
<span class="sourceLineNo">338</span><a name="line.338"></a>
<span class="sourceLineNo">339</span>        // Sanity check<a name="line.339"></a>
<span class="sourceLineNo">340</span>        if (branch == null)<a name="line.340"></a>
<span class="sourceLineNo">341</span>            throw new IllegalArgumentException("null branch");<a name="line.341"></a>
<span class="sourceLineNo">342</span>        if (!BRANCH_NAME_PATTERN.matcher(branch).matches())<a name="line.342"></a>
<span class="sourceLineNo">343</span>            throw new IllegalArgumentException("illegal branch name `" + branch + "'");<a name="line.343"></a>
<span class="sourceLineNo">344</span>        if (other == null)<a name="line.344"></a>
<span class="sourceLineNo">345</span>            throw new IllegalArgumentException("null other");<a name="line.345"></a>
<span class="sourceLineNo">346</span>        if (strategy == null)<a name="line.346"></a>
<span class="sourceLineNo">347</span>            throw new IllegalArgumentException("null strategy");<a name="line.347"></a>
<span class="sourceLineNo">348</span>        if (message == null)<a name="line.348"></a>
<span class="sourceLineNo">349</span>            throw new IllegalArgumentException("null message");<a name="line.349"></a>
<span class="sourceLineNo">350</span><a name="line.350"></a>
<span class="sourceLineNo">351</span>        // Get ref file and verify branch is really a local branch<a name="line.351"></a>
<span class="sourceLineNo">352</span>        final File refFile = this.getRepoFile("refs/heads/" + branch);<a name="line.352"></a>
<span class="sourceLineNo">353</span>        if (!refFile.exists())<a name="line.353"></a>
<span class="sourceLineNo">354</span>            throw new GitException("branch `" + branch + "' does not exist or is not a local branch");<a name="line.354"></a>
<span class="sourceLineNo">355</span><a name="line.355"></a>
<span class="sourceLineNo">356</span>        // Reset<a name="line.356"></a>
<span class="sourceLineNo">357</span>        this.reset();<a name="line.357"></a>
<span class="sourceLineNo">358</span><a name="line.358"></a>
<span class="sourceLineNo">359</span>        // Perform merge steps<a name="line.359"></a>
<span class="sourceLineNo">360</span>        try {<a name="line.360"></a>
<span class="sourceLineNo">361</span><a name="line.361"></a>
<span class="sourceLineNo">362</span>            // Check out branch<a name="line.362"></a>
<span class="sourceLineNo">363</span>            new GitCommand(this.dir, "checkout", "--force", branch).run();<a name="line.363"></a>
<span class="sourceLineNo">364</span><a name="line.364"></a>
<span class="sourceLineNo">365</span>            // Perform the merge<a name="line.365"></a>
<span class="sourceLineNo">366</span>            strategy.merge(this.dir, other);<a name="line.366"></a>
<span class="sourceLineNo">367</span><a name="line.367"></a>
<span class="sourceLineNo">368</span>            // Detect and ignore trivial merge<a name="line.368"></a>
<span class="sourceLineNo">369</span>            if (new GitCommand(this.dir, "status", "--porcelain").runAndGetOutput().length() &gt; 0) {<a name="line.369"></a>
<span class="sourceLineNo">370</span><a name="line.370"></a>
<span class="sourceLineNo">371</span>                // Grant access<a name="line.371"></a>
<span class="sourceLineNo">372</span>                if (accessor != null)<a name="line.372"></a>
<span class="sourceLineNo">373</span>                    accessor.accessWorkingCopy(this.dir);<a name="line.373"></a>
<span class="sourceLineNo">374</span><a name="line.374"></a>
<span class="sourceLineNo">375</span>                // Commit changes<a name="line.375"></a>
<span class="sourceLineNo">376</span>                new GitCommand(this.dir, "commit", "--message", message).run();<a name="line.376"></a>
<span class="sourceLineNo">377</span>            }<a name="line.377"></a>
<span class="sourceLineNo">378</span>        } finally {<a name="line.378"></a>
<span class="sourceLineNo">379</span><a name="line.379"></a>
<span class="sourceLineNo">380</span>            // Clean up<a name="line.380"></a>
<span class="sourceLineNo">381</span>            this.reset();<a name="line.381"></a>
<span class="sourceLineNo">382</span>        }<a name="line.382"></a>
<span class="sourceLineNo">383</span><a name="line.383"></a>
<span class="sourceLineNo">384</span>        // Done<a name="line.384"></a>
<span class="sourceLineNo">385</span>        return this.getCurrentCommit();<a name="line.385"></a>
<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
<span class="sourceLineNo">387</span><a name="line.387"></a>
<span class="sourceLineNo">388</span>    /**<a name="line.388"></a>
<span class="sourceLineNo">389</span>     * Read file possibly containing a reference and follow it until we get a commit ID.<a name="line.389"></a>
<span class="sourceLineNo">390</span>     *<a name="line.390"></a>
<span class="sourceLineNo">391</span>     * @param filename filename relative to {@code .git}, e.g., {@code "HEAD"} or {@code "refs/heads/foobar"}<a name="line.391"></a>
<span class="sourceLineNo">392</span>     * @return SHA-1 commit ID<a name="line.392"></a>
<span class="sourceLineNo">393</span>     * @throws GitException if we can't figure it out<a name="line.393"></a>
<span class="sourceLineNo">394</span>     */<a name="line.394"></a>
<span class="sourceLineNo">395</span>    public String followReference(String filename) {<a name="line.395"></a>
<span class="sourceLineNo">396</span>        for (int i = 0; i &lt; 10; i++) {<a name="line.396"></a>
<span class="sourceLineNo">397</span><a name="line.397"></a>
<span class="sourceLineNo">398</span>            // Read file<a name="line.398"></a>
<span class="sourceLineNo">399</span>            final File file = this.getRepoFile(filename);<a name="line.399"></a>
<span class="sourceLineNo">400</span>            String line;<a name="line.400"></a>
<span class="sourceLineNo">401</span>            try {<a name="line.401"></a>
<span class="sourceLineNo">402</span>                line = this.readFirstLine(file);<a name="line.402"></a>
<span class="sourceLineNo">403</span>            } catch (IOException e) {<a name="line.403"></a>
<span class="sourceLineNo">404</span>                throw new GitException("error reading `" + file + "'", e);<a name="line.404"></a>
<span class="sourceLineNo">405</span>            }<a name="line.405"></a>
<span class="sourceLineNo">406</span><a name="line.406"></a>
<span class="sourceLineNo">407</span>            // Is it a SHA-1?<a name="line.407"></a>
<span class="sourceLineNo">408</span>            if (SHA1_PATTERN.matcher(line).matches())<a name="line.408"></a>
<span class="sourceLineNo">409</span>                return line;<a name="line.409"></a>
<span class="sourceLineNo">410</span><a name="line.410"></a>
<span class="sourceLineNo">411</span>            // Is it a reference?<a name="line.411"></a>
<span class="sourceLineNo">412</span>            final Matcher matcher = Pattern.compile("ref: (.*)$").matcher(line);<a name="line.412"></a>
<span class="sourceLineNo">413</span>            if (matcher.matches()) {<a name="line.413"></a>
<span class="sourceLineNo">414</span>                filename = matcher.group(1);<a name="line.414"></a>
<span class="sourceLineNo">415</span>                continue;<a name="line.415"></a>
<span class="sourceLineNo">416</span>            }<a name="line.416"></a>
<span class="sourceLineNo">417</span><a name="line.417"></a>
<span class="sourceLineNo">418</span>            // Dunno<a name="line.418"></a>
<span class="sourceLineNo">419</span>            throw new GitException("can't interpret contents of `" + file + "': " + line);<a name="line.419"></a>
<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
<span class="sourceLineNo">421</span>        throw new GitException("too many levels of git references");<a name="line.421"></a>
<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
<span class="sourceLineNo">423</span><a name="line.423"></a>
<span class="sourceLineNo">424</span>    /**<a name="line.424"></a>
<span class="sourceLineNo">425</span>     * Clean out and reset working directory.<a name="line.425"></a>
<span class="sourceLineNo">426</span>     */<a name="line.426"></a>
<span class="sourceLineNo">427</span>    protected void reset() {<a name="line.427"></a>
<span class="sourceLineNo">428</span>        new GitCommand(this.dir, "clean", "-xdf").run();                      // clean out working directory<a name="line.428"></a>
<span class="sourceLineNo">429</span>        new GitCommand(this.dir, "reset", "--hard").run();                    // discard uncommitted changes<a name="line.429"></a>
<span class="sourceLineNo">430</span>    }<a name="line.430"></a>
<span class="sourceLineNo">431</span><a name="line.431"></a>
<span class="sourceLineNo">432</span>    /**<a name="line.432"></a>
<span class="sourceLineNo">433</span>     * Get the commit ID of what we have currently checked out (i.e., our HEAD).<a name="line.433"></a>
<span class="sourceLineNo">434</span>     *<a name="line.434"></a>
<span class="sourceLineNo">435</span>     * @throws GitException if we can't figure it out<a name="line.435"></a>
<span class="sourceLineNo">436</span>     */<a name="line.436"></a>
<span class="sourceLineNo">437</span>    protected String getCurrentCommit() {<a name="line.437"></a>
<span class="sourceLineNo">438</span>        return this.followReference("HEAD");<a name="line.438"></a>
<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
<span class="sourceLineNo">440</span><a name="line.440"></a>
<span class="sourceLineNo">441</span>    /**<a name="line.441"></a>
<span class="sourceLineNo">442</span>     * Read the first line of a file (trimmed) as a {@link String}.<a name="line.442"></a>
<span class="sourceLineNo">443</span>     */<a name="line.443"></a>
<span class="sourceLineNo">444</span>    protected String readFirstLine(File file) throws IOException {<a name="line.444"></a>
<span class="sourceLineNo">445</span>        final FileInputStream inputStream = new FileInputStream(file);<a name="line.445"></a>
<span class="sourceLineNo">446</span>        try {<a name="line.446"></a>
<span class="sourceLineNo">447</span>            final LineNumberReader reader = new LineNumberReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));<a name="line.447"></a>
<span class="sourceLineNo">448</span>            final String firstLine = reader.readLine();<a name="line.448"></a>
<span class="sourceLineNo">449</span>            if (firstLine == null)<a name="line.449"></a>
<span class="sourceLineNo">450</span>                throw new GitException("read empty content from `" + file + "'");<a name="line.450"></a>
<span class="sourceLineNo">451</span>            return firstLine.trim();<a name="line.451"></a>
<span class="sourceLineNo">452</span>        } finally {<a name="line.452"></a>
<span class="sourceLineNo">453</span>            try {<a name="line.453"></a>
<span class="sourceLineNo">454</span>                inputStream.close();<a name="line.454"></a>
<span class="sourceLineNo">455</span>            } catch (IOException e) {<a name="line.455"></a>
<span class="sourceLineNo">456</span>                // ignore<a name="line.456"></a>
<span class="sourceLineNo">457</span>            }<a name="line.457"></a>
<span class="sourceLineNo">458</span>        }<a name="line.458"></a>
<span class="sourceLineNo">459</span>    }<a name="line.459"></a>
<span class="sourceLineNo">460</span><a name="line.460"></a>
<span class="sourceLineNo">461</span>    /**<a name="line.461"></a>
<span class="sourceLineNo">462</span>     * Get the {@link File} corresponding to the given relative path under the {@code .git} directory.<a name="line.462"></a>
<span class="sourceLineNo">463</span>     *<a name="line.463"></a>
<span class="sourceLineNo">464</span>     * @param path relative path, e.g., {@code HEAD} or {@code refs/heads/foo}<a name="line.464"></a>
<span class="sourceLineNo">465</span>     */<a name="line.465"></a>
<span class="sourceLineNo">466</span>    public File getRepoFile(String path) {<a name="line.466"></a>
<span class="sourceLineNo">467</span>        return new File(new File(this.dir, ".git"), path);<a name="line.467"></a>
<span class="sourceLineNo">468</span>    }<a name="line.468"></a>
<span class="sourceLineNo">469</span><a name="line.469"></a>
<span class="sourceLineNo">470</span>// Accessor<a name="line.470"></a>
<span class="sourceLineNo">471</span><a name="line.471"></a>
<span class="sourceLineNo">472</span>    /**<a name="line.472"></a>
<span class="sourceLineNo">473</span>     * Callback interface used to access or modify working directory contents.<a name="line.473"></a>
<span class="sourceLineNo">474</span>     */<a name="line.474"></a>
<span class="sourceLineNo">475</span>    public interface Accessor {<a name="line.475"></a>
<span class="sourceLineNo">476</span><a name="line.476"></a>
<span class="sourceLineNo">477</span>        /**<a name="line.477"></a>
<span class="sourceLineNo">478</span>         * Access the working copy in the specified working directory.<a name="line.478"></a>
<span class="sourceLineNo">479</span>         *<a name="line.479"></a>
<span class="sourceLineNo">480</span>         * @param dir working directory root<a name="line.480"></a>
<span class="sourceLineNo">481</span>         * @throws IOException if an I/O error occurs<a name="line.481"></a>
<span class="sourceLineNo">482</span>         */<a name="line.482"></a>
<span class="sourceLineNo">483</span>        void accessWorkingCopy(File dir);<a name="line.483"></a>
<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
<span class="sourceLineNo">485</span>}<a name="line.485"></a>
<span class="sourceLineNo">486</span><a name="line.486"></a>




























































</pre>
</div>
</body>
</html>
